From d5ccfd0d3f2c9a632cdb88d69ffe0cfa75c2acd9 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 17 Jan 2009 10:58:59 +0000 Subject: [PATCH] New installed file with babl_init() and babl_destroy() declarations. * babl/babl-main.h: New installed file with babl_init() and babl_destroy() declarations. * babl/babl.h: Include it. * babl/Makefile.am: Add it. svn path=/trunk/; revision=368 --- ChangeLog | 9 +++++++++ babl/Makefile.am | 2 ++ babl/babl-main.h | 35 +++++++++++++++++++++++++++++++++++ babl/babl.h | 10 +--------- 4 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 babl/babl-main.h diff --git a/ChangeLog b/ChangeLog index 22312ff..5a28fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-01-17 Martin Nordholts + + * babl/babl-main.h: New installed file with babl_init() and + babl_destroy() declarations. + + * babl/babl.h: Include it. + + * babl/Makefile.am: Add it. + 2009-01-17 Martin Nordholts * babl/babl-macros.h: New installed header file that contains diff --git a/babl/Makefile.am b/babl/Makefile.am index c0a7c43..bf52391 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -38,6 +38,7 @@ h_sources = \ babl-ids.h \ babl-internal.h \ babl-macros.h \ + babl-main.h \ babl-memory.h \ babl-util.h \ babl.h \ @@ -55,6 +56,7 @@ library_include_HEADERS = \ babl-format.h \ babl-image.h \ babl-macros.h \ + babl-main.h \ babl-model.h \ babl-sampling.h \ babl-type.h \ diff --git a/babl/babl-main.h b/babl/babl-main.h new file mode 100644 index 0000000..e0a7fa3 --- /dev/null +++ b/babl/babl-main.h @@ -0,0 +1,35 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind Kolås and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_MAIN_H +#define _BABL_MAIN_H + +#ifndef _BABL_H +#error this file is only to be included by babl.h +#endif + +/** Initialize the babl library */ +void babl_init (void); + +/** Deinitialize the babl library (frees any resources used, if the number + * of calls to babl_destroy() is is equal to the number of calls to + * babl_init() + */ +void babl_destroy (void); + +#endif diff --git a/babl/babl.h b/babl/babl.h index dfc1790..a1e99a1 100644 --- a/babl/babl.h +++ b/babl/babl.h @@ -31,6 +31,7 @@ #endif #include "babl-macros.h" +#include "babl-main.h" /* magic number used at the start of all babl objects, used to do * differentiation in polymorphic functions. (as well as manual @@ -76,15 +77,6 @@ typedef union _Babl Babl; typedef struct _BablList BablList; -/** Initialize the babl library */ -void babl_init (void); - -/** Deinitialize the babl library (frees any resources used, if the number - * of calls to babl_destroy() is is equal to the number of calls to - * babl_init() - */ -void babl_destroy (void); - typedef int (*BablEachFunction) (Babl *entry, void *data); -- 2.30.2